Took care of some bugs.