Updated some stuff, not completed