Editor improved
Various corrections