some fixes

collection of local patches
What extra space?