options: incremental improvements and debugging