various fixes + added some of the account stuff