fixes and tag