Many updates for initial version.