small changes and fixes, had some missing classes

 had some missing classes, my bad