Odds n ends
Merge branch 'caple9'