added new block expand fns
tmp
changing to newer macro escape mechanism, using uints in more places
comments & whitespace