Fixed bugs with starting solutions. Fixed detecting whether full solution is ending/starting