Fix prediction scale
Update TODO