updated master some more