I agree with all of the above. I would just like to add one thought:
I think that, except for the bass strings picked with the thumb, you should try not to pick the same string twice in a row with the same finger. Where possible, you should alternate fingers, when picking adjacent notes on the same string. This adds more variety to the sound, each finger having a different tone, and improves speed.
Try picking the same note over and over, first with one finger, then alternating two fingers. Listen to the difference in tone. Which do you like?