updates

added some toggles for testing and a few other tweaks, still fleshing
out core idea