add more guru mode fixes i think