More fixes and improvements!
Added 5 classifications for tst file.