MAINT: final fixes i hope