Fixes

passing this by everyone before I merge, comments inline