fixing details for inminent merge with master