fixed one problem, need to go through and debug