Fixed some bugs or whatever