fixing+more