fixed some stuff from merge, working on reset