updates to resolve issues 76 78 79 81 84