Additional info and minor codechanges.