BuzzSaw tweaks. Still need to clean up/commit again