Some bugs fixed :D