Added a few name and class weights
Improved comments, minor changes