Added and corrected things