Improve tags and fix shifting