Fixed some bugs. Woop woop