predictions + state fixes