Added corrections for the post merge. things seem to be lining up nicely so far