fixed some of the bugs in #30"