couple of GUI updates and switcharoos.