Bug Fixes, Preliminary Testing.

Looks very good!