shored up source, updated contribs