Updated stuff that needed updatin