clean up and fix save nbtTag