More stupid mistakes, more fixing shit