Minor changes and add public/