Lots of fixes, plus an admin account. Will send out new db file