Added Lance contributions; Other minor changes