Solved some small bugs.