working commit, everything works like it used to... plus a bit
one inversion slipped through... fixed it