libs updated, builder improved