small changes.
fixes.
prep for refactor to enable 'toggleable behaviors'
Skeleton Files for refactor