Fixes for issues noted during training
Resolve merge conflicts
Updated to v2.0.1