minor changes and catchup before attempting ACL