add fixes and options support