changes, fixes and additions