make properties/hybrids work, refine testing+docs