Changed a couple callbacks so that the compiled JS won't return stuff I don't want it to return