finishing auto pointers
cleaning up some other code