additional lib references
some improvements