humpf
fixed accessor
fixed various things