Some more improvements
MOAR