I would add another thing to the Geek type: stamp collection.
A more general reflexion: what would happen to those types if they were all girls? I somehow get the feeling that more feminine aspects could be added. A female Jock could for sure be crazy about horses, just to mention one detail. And a female Geek might play piano or flute and be Super Christian. And a female Troublemaker could be pregnant or just having a relationship with an older, really dangerous guy (or girl).