Added Connection Machine

* Other misc. fixes