Add maps and other minor fixes.