more changes from master