updated info
updated tests.
renamed some internal variables.