minor changes and fixes

Added in *Some* corrections
Changed classes names for better understanding/usability