Update to resolve #8 mostly