Simplifications and fixes - no more tag writing