Some small changes.
Merge branch 'rewrite' of github.com:JoakimSoderberg/catcierge into rewrite