Updated some stuff

Look at tha commits :D