Some fixes
Call option added