some cleanup and path updates