Misc clean up and addition