fix indeces for spindles. We should try to be consistent about beginning and end of spindles, if they are inclusive or not