fixed some class errors