fix little flaws