Last update in a while, fixed a bunch of minor things