Fixed some bugs!! :D

Still might be a bit buggy