Reworked a couple things