Fixes and new Options added