Large changes to support express3, ssh (only at this point forward), and bug fixes