updates to options handling, format updates