LOOOOOOOOTS of fixes