A bunch of changes
Fixes