Fixed a few things, made code nicer, and added stuff

<3