Minor reformat
Large changes -- need to update help
Updates
Updates