improved system locking and corrected tag loading