add schrodinger-cat and misc fixes