some bug fixes, uber basic usage works with prop sets. Need many, many more tests