small changes, first revisit in a while.