fixed filler issues with if-then-else; fixed caching issues with filler; consolidated code
reorg