More comprehensive solutions to these problems.
Adjacency now works.