Cypher completed with error checking, minor bugs resolved.