Try to do less metaphor mixing + fixes
Try to do less metaphor mixing + fixes


Former-commit-id: 7814ad5265b74abb866fa4848ae6f8a77eb612b2
brandur/sorg,brandur/sorg,brandur/sorg,brandur/sorg,brandur/sorg