more changes, fixes, tweaks