Cleanup, and validated all options functional