Improve verification, clean up path generation/handling