list token, code restructure, and other enhancements...