General library update...

I should be pushing more often...