added new class members and fixed bugs