genio: small updates based on off-line review.