fix annotation formatting issues and positioning bug