libs and class updates - 10/21