Add start and finish limits. Resolve some issues.