Added calls that should not be replaced.

This is for #33.
It also contains some code clean up.
Updated documentation.