plenty of fixes