removed some debug and fixed some messages