Fix api & add new commands