* Avoiding synthetic access.
	* Avoiding potential NPEs.
	* Minor JavaDocs fixes.
	* Added some TODO tasks.