more changes, fixes, etc