renamed some things, made some small improvements, stuff, things