more reconcile fixes, optimized ++