Small bits of refactoring.

* Fixed issue with some files not being committed.
* Small changes here and there.