Replaced command-line options so they are more consistent. Some cleaning up.