Moved stuff around, fixed some bugs, added some things