fixed #67. other minor chgs