Add some comments, remove history querying