some small adjustments on #31