Made adjustments, refactors & added new stuff.