Added more libs, small fixes