commit before cleanup
Small Fixes.