My Preferences

Various changes to support our library more.