Solved some bugs!