Bug fixes and GH review suggestions.