hordes of fixes