some updates and inline comments