Modified source to change headers and to try to make assertions in main() less strict.