grr bug somewhere causing access violations
Revert "grr bug somewhere causing access violations"

This reverts commit 6b196f6b66fb550982966aa65d94f83a67bea467.
Minor tweaks