changes, fixes