I think all new code & options working now. Bugfix