Updated properties and fixed a couple of compiler warningss.