Modifications made Feb 18th not yet commited variaus tweaks and fixes