odds&ends stuff #1

pm sent on the patches