You'd probably want to bump 1000 iterations of PBKDF2 to something like 100000 in the next version. Better: include cost parameter in key format, and calculate the number of iterations on-the-fly by estimating how many iterations it takes for a certain amount of time.
good point. For different things we kept it quite simple, but soon we are certainly going towards these refinements and your suggestion sounds pretty good imho