Added 1-2-2 plays...some minor cleanup.

Still looks awful though. :)