Fixes and a couple of suggestions