fixed the bugs
blah