Lotsa Changes and Fixes