minor changes -added some extra message logging