Added and corrected many features