Fix some things, maybe
Merge remote-tracking branch 'origin/jacob' into jacob