fixed links and includes