[@EnterTheHero]

So i made some changes, let me know if i need to make further changes.