Changed some stuff

Don't know what, has been sometime since have been working on this