Update src, lib, and TO-DO