Added TyZeff's work to replace callback() and more

Also changed an option.js value.