added reflector hook, other small fixes