Completed final touch up

Completed final touch up, about to push my changes in private
repository.