Pure/Mixed states added into domains; some other minor updates
merge