updated some getter/setter