lol more fixes