couple of fixes. test is coming next