Urifix

fixes #91, fixes #92, fixes #94