Some fixes and prep for new additions
Some more clean up