make previousStop vertex types match table entries, fixes #1056
organize imports