Added tons of options. Prepared for Splunk Apps upload.