fixed bugs
class work