Removal of broken packages
Escaping of string
Correction of references
Changings due to meeting with mr. eckerle