Improve accuracy and demo interface.