Added ACL support. Also minor fixes here and there.