initial commit fixes