Finished TaggingLayer refactoring. Fixed other minor issues.