resolved first couple of issues