incremental checkin with improved specs and numerous changes.