tons of small changes to bring this up to date with maxclaims 2.0