debugged a little
finished debugging