Misc Changes and Additions