debugged some more