Fixed some stuff, close to finished