Made a few changes

Applied changes to classes requested by @TBotV63