sad tool, and fixes/cleanup