some fixes

collection of local patches
Extra space.