improved & refactored prototype; complete property evaluation for scalar types