many changes
jonas' corrections