May improvements to many areas, terrible commit message