#1 #2 #6 - More cleaning up of how things look as well as initial playing around with storing options.