Moved stuff, changed stuff, made it not crash as much