Fixed a bunch of bugs. They still keep coming