work on cleaning up some silly errors