new "prop" function + small fixes