Added bug fixes and a disconnect button

Connor