Updated EVERYTHING to current working copy state - Errors with Null consequences