Fixed some bugs everything should be good now