More updates and testing.

- updates -