Cleaned up driver code, made DataMap::set type-safe, comments.