Comment navigation + some fixes.