Some main work on stuff, cleaning it up