fixed links and cleanup