Option to leave instances running, bug fixes