Latest cleanplot oddball changes