Bug fixes and more Options
Shorter