added start of properties and fixed up some small bugs