WIP on internal links and some add'l config options