update to include where the source is, and misc. updates to match