update toollib, fixed small things (imports)