updates to make things more correct
major additions to almost bring the re-sampling code to where we want it go be - just needs the bootstrap code now I think