access control improvements and edit