[TASK] Fixes and new Options