fuckload of fixes