Fixed some stuff. beginning of coding night