WIP: A bunch of little changes. Will be rebased.