Got rid of stuff and fixed other stuff