Tweaks + New Classes

Added some Tweaks and some New Classes