Kinda fixed the major bug we have

other bugs created though