cleaning debug
some fixes