Fixed some things (MAYBE)