rename a lot of functions; account form work
tweak some model cross-refs; add CachedVal to simplify