Small clash and table bug fixed.