some adjustments made to fix some tiny errors introduced in the merging process