code + doc fix