- shitloads of fixes