fixes -mostly