tweaks. ready to merge back into dev.