tidy up properties. probably need more fiddling. need to sort property data structures.