minor changes
fixed conflicts
Added consistency-check methods