some updates due to comments reported by tutor