Set point in a more useful place for adding additional arguments.

Closes #48, #49.