Fix issue with pointers everywhere again.

Closes #51
Closes #50