finals and a bit of cleanup