tweaks and new mode... still lots to do