fixed some stuff (still unfinished)