a few updates on classes