Work in progress

Hi Dave

I've fixed most of the references, applied pull request #50 #51 by hand. 

Besides I made the use `$.isFunction` and single quotes consistent.

`this.callOption.apply(this, arguments);` is not working, can you look at it?