added corrections based on comments from Aki