latest round of improvements
Moar fixes