initial commit and build fixes