updated some getter setters and public -> private