bunch of changes
more libs