fix and cleanup
add granting public access