Removed todo block, updated lib.