updated to match new accessors
updated to use new accessors
updated to use new accessor
fixed accessors
more accessor fixes, changed to use new ClavinLocationResolver