Improved several annotations