committing mods and tweaks and optimizatons