help text and cosmetic changes
merge