fixes / small changes but with a huge effect