fixed a few minor issues for demo