Minor Changes and some debugging