doing a cleaner merge. found the issues in my old branch that were giving me such a headache all day. let's see how a CI does now, I'm expecting a couple of fails but all the reputation-0 fails should now be fixed
