other edits to the new classes. good night!