Second Big Update

Python-only version and options support