Fixed bugs, added more bugs