Some tiny things fixed leading ot even worser bugs popping up in its place