Mostly adding due to help script, clean up rest.