many small fix