ACL support added and a couple of bugs fixed.