Small improvements based on experience with loading data
A bit of cleanup
Update README