updated to source with latest auto-corners and optional digits