Updating to latest lib and src