Added disconnect action, little bug fixes