Small changes and tweaks to the classes

Can't type DX