Some improvements to the reflect mechanic