Some more mundane tweaks

code trolling at its best !