Refs #68; Cleaned up the option method and did some QA.