mapping tweaks for adding blank lines
some fixes to retab logic