Some minor changes here and there. Setting up for PUT testing