Cleaning up & Properties support

+ Scaling fix WIP
Working in DynStat combination scaling