fixes and improvements in Entry-class