Fixed loading vector file from disk.
Cosmetic improvments.