master some more changes