fixed disabled segmented control (race condition?)
cleaned out some cruft
cleaned a few things up