Critical fix
and slight reordering of callbacks
0.0.1