A bug with OH_overlap fixed. Many other fixes