improved options, documentation, and handling (WIP)