Fixed bugs and change some things!