Add information to the index, and fix little things