Thanks a lot. Don't feel rushed or anything, take your time since nobody's paying you to do this (would be great if they did, since you're making their game better).
Sad that you have to bump into hard limits like the number of entries, they really didn't think this through for the PC audience...