Tidied up the output and made the ACL delete work in a more sane way.