Cleaned up a bit before public release.