Schuster Changes and few fixes