some properties reorg
updates