added dumps and better hacky scaling