updated setup and configure.
some updates befor eleaving work