new methods, some corrections