fourth commit - another review, few changes