2014.03.14 - couple of changes and updates

Should now better support having multiple windows open, changing users, etc.