Support base directory in property data store
Fix bad comments/formatting