link flicker fix, better commenting