merging fixes from master