Enhanced phpDoc, some minor bug fixes and improvements