Upped limit of number of points to 2000; fixed #426
Fixed #439