fork of prime agent with changes i want but are not upstreamable probqbly (and some fixes)

nix improve master


+116 -5
3 changed files