Pull Request - minor changes + 'properties'