Bunch of great improvements to /libs classes