+ some corrections