some more snakebite and fix up include/account - forgot about that inline array stuff