lots of modifications to hopefully allow for a better use of accounts via zk