fix some command / api issues