intermediate commit
some corrections