Updated some privete properties to instance variables, removed from Model properties 'atomic' set in Mac version of app to 'nonatomic'