updated for latest build and resharper fixes; no signature changes