diff --git a/extraponies/faust.pony b/extraponies/faust.pony
index c6a92507..8b358c69 100644
--- a/extraponies/faust.pony
+++ b/extraponies/faust.pony
@@ -12,7 +12,7 @@ LINK: regular
 MANE: red
 MEDIA: deviantart.com (varius artists)
 NAME: Faust (most frecuent name)
-OTHER NAMES: Lauren Faust ('owner name'), Fausticon (given in other minor sources)
+OTHER NAMES: Lauren Faust (owner name), Fausticon (given in other minor sources)
 POSE: stand
 SOURCE: [jristz]
 WIDTH: 51
diff --git a/extraponies/johndelancie.pony b/extraponies/johndelancie.pony
index ba39cab1..c7ce6a7a 100644
--- a/extraponies/johndelancie.pony
+++ b/extraponies/johndelancie.pony
@@ -11,7 +11,7 @@ KIND: unicorn
 LICENSE: cc-by-sa (Creative Commons Attribution-ShareAlike 3.0 Unported)
 LINK: regular
 MANE: gray
-MEDIA: Docummentary
+MEDIA: Documentary Film
 NAME: John de Lancie (owner name, given by the author)
 POSE: stand
 SOURCE: [jristz]
diff --git a/extraponies/pinkaminacupcake.pony b/extraponies/pinkaminacupcake.pony
index 1c2b87b6..a60498cf 100644
--- a/extraponies/pinkaminacupcake.pony
+++ b/extraponies/pinkaminacupcake.pony
@@ -1,20 +1,21 @@
 $$$
-APPEARANCE: S01E01 Friendship is Magic part 1
+APPEARANCE: S01E01 Friendship is Magic [part 1]
 BALLOON: top
-BASED ON: pinkie
+BASED ON: Generation 3 Pinkie Pie
 COAT: pink
 DISPLAY: full, left
 EYE: blue
 FREE: no
 GROUP: mare, mane
 KIND: earth
+LINK: regular
 MANE: pink
 MASTER: pinkie
-MEDIA: [fanfic: Cupcakes (NSFW)]
+MEDIA: [Fanfic: Cupcake (NSFW)]
 NAME: Pinkie Pie
-OTHER NAMES: Pinkie, Pinkamina Diane Pie
-POSE: sad, crazy, cupcaked
-SOURCE: desktop ponies OC
+OTHER NAMES: Pinkie (offical, short name), Pinkamina Diane Pie (official, full name)
+POSE: cupcake
+SOURCE: desktop ponies
 WIDTH: 49
 HEIGHT: 26
 
diff --git a/ponies/pinkie.pony b/ponies/pinkie.pony
index 44fcb09b..bd826c0c 100644
--- a/ponies/pinkie.pony
+++ b/ponies/pinkie.pony
@@ -12,7 +12,7 @@ MANE: pink
 MASTER: pinkie
 NAME: Pinkie Pie
 OTHER NAMES: Pinkie (official, short name), Pinkamina Diane Pie (official, full name)
-POSE: happy (very descriptive for pinkie pie)
+POSE: happy (very descriptive for pinkie Pie)
 SOURCE: desktop ponies
 WIDTH: 49
 HEIGHT: 22