access fixes, slight restructure