Added new stuff and corrected old - prepared these parts for delivery to Radu