Fixed bugs and other... improved!