tweaks to improve reliability, formatting and move tags over