v1
some corrections