Added additional numbers. Some fixes.