Fix multiple fucking bugs