bring over changes and fixes