change some names, weak references in callbacks, bump grade plugin version