added some parameters, added some stuff to index and tests