Adding pointers and some minor fixes.