Fixed a few things, cleaned some stuff up