Change some stuff
Too tired to write proper change log zzzzzzzz