fix everything that got mentioned