Minor changes.
Kill a few TODOs.
Merge pull request #240 from pleroy/Frame

Minor cleanups