added methods to Properties, and fixed variable names