use mattr accessors
small fixes