missing file
cleanup: account name in menu, constructor params, etc.
Merge branch 'master' into nook