Big update.  Useability tweaks