cleanup
cleanup acl
better tests and coverage