major cleanup and maybe implemented stalker mode