looooots of fixes