Added open command, misc. cleanup