improved some prediction functionality