Fixed some bugs and made some new