Fixed some bugs and level modifications