Giant Raft of Fixes

AKA: Fen forgets to do individual commits