Several improvements and prediction command