Fixed some bugs and added proper hitboxes