Major changes and fixes potentially coming