fixing flaws I created