Update
* Included previously untracked changes
* cleaned up code