several tweaks to clean up flow
tweaks