WIP
Enable public dir and some minor fixes