Readme updates
Override annotations added
Code cleanup and minor fixes