a little api fix; cleanup