libs update and improvement
minor corrections