Some bug fix, create command done&tested