some minor changes -cleaning debug messages