Fixed some shit, still unfinished