3a, 3b added. black hole exists. transitions untested
fixed merge conflicts
fixing merge conflicts

anch 'origin/master'

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
borts
# the commit.
fixing merge conflicts