initial commit fixes.