made some test
some updates