Tightened access, added comments