Updates, cleanup, pre-opened links
Small fixes