More features implemented and corrected