minor changes, reference to pointer and such