Option updates and bug fix