minor tweaks and ACL