Use data directory as property data store base dir
Fix bad comments/formatting