Fix problems brett could not tackle