Some improvements

Sweet class! I made a couple improvements