Moar updates

Minor changes to break out of mode selection