Fixed bugs in property
recommiting my edits