toggle public and other minor fixes