* more small fix