getting bug fixes from master