Fixed some bugs ;)