updates and fixes different classes