better callback handling
fix jquery proxy usage