Acls fix + styling + generation issues fixes