debugging

removed some bugs