Stuff

Did some stuff and fixed some stuff