update to 1.1

add callbacks.  TODO: document callbacks