#48 added a few comments and revised wording if messages