Fixed a few problems, added 21.