Made a lot of minor changes. Added PropertyInteger