linii2 ; also some small changes, added notes