describe in README and template how to use callbacks properly
fix merge conflicts and add some tiny fixes