Full review (do not merge)

Leftovers?