Misc. improvements
Switched back to stool, with correct projection etc