Changes after first and second review and small improvements