added trace and options
fixing resharper code issues
fixing resharper code issues
fixing resharper code issues
fixing resharper code issues