explicitly add thor
fix callbacks

ewps!