fixing up my flaws