Added indexing for properties. Changed some variable names and doccomments