Updated vendor libs
Tidy up