Included more debug and comments on persistence code.