Fixed some bugs and added some indices.