Updated and fixed commit for completed properties and scope