some fixes, more metadata and navigation