Updated and fixed all crap

c: