More tests complete 90%+ on all coverage stats.
Fixed some bugs.