fixed links and header names