Added some things and fixed some bugs :D