Lazyness and some corrections