fixed some class methods