classes changes and fixes