Build and git changes.
Fixing a typo, also some code cleanup