Fixeds some small bugs.