a few more classes commented