A bunch of changes/fixes