fix problems with Pure functions (there was a const that should have been pure), cleaned up discs code for const pointers, pure and constant functions