added exp method
fixed pull errors