Fixclone

fix #42 (closed), #168 (closed), the first item of #387 (closed), and the umbrella bug #396 (closed)

To be handled at some later point: #391 (uninstantiated val's can lead to an inconsistency; adopt the defensive stance), the second and third items of #387 (closed) (not sure about this one), and #389.