Changes after first review and small improvements