Fixed IsSolution. Other minor fixes.