Fixed some bugs. To fix bugs.