Mini-update of lib & tools
Import 2 posts from shortbrain