Miscellaneous of minor change, bug fix and clean up.
This will create a new commit in order to revert the existing changes.