Lots of fixies/feats

The diff will be a bit screwed but I'm ok with that