more clean up....re-organized priorities, added 'pup suffix' and 'license msg' to default enabled setup