Additional Updates.

Futher updates to refactor various items and implement improvements.