Property defaults should now be taken into account; also cleaned up a little (#119)