Made many properties into defines
readme changes