Fixed some stuff, fix the rest when sober :P