Fixes

• fix wrong column count in some cases

Others

• redo pop-note to improve it