Just some clean-up of the text UI that needed to get done: First patch cleans up input handling, which had some inconsistencies and other sloppiness. Most of this is just moving code around, renaming things, and deleting unneeded bits. Second patch just gets rid of an unneeded property in the storage spoke.