fixed onstar clicking issue
more bug fixes related to options. Updated tests