Did some fixes, renamed some stuff

probably messed some stuff up