fixed a merge issue. added a few console logs.