class it up
More fixes