Annotations added
Some fixes