some corrections after merging