Updated some stuff

Can't remember exactly what I did here...