Updated
fixed some typos; improved load path stuff