Minor tags and javadoc changes

Change-Id: Ia3d9058df1ad3777d445f05f4e1bf5d7a95942a3