add nave, update links, final touches