Minor updates to constants, help text and comments