Simplified options parsing

This should make use of the program much easier.