Forgot to reset font size
Lots of various fixes and enhancements