corrections to 4 pointers and some testing
merging