fixing the last things