final tweaks commit