A lot of fixes related to pointers and all.