fixed rand's, and in doing so noticed problem with winding numbers which is mostly fixed, except for rare cases.