add comment box functionality for tlc
fix merge conflicts