#72 small changes