some changes and prepare to GUI build
some changes and prepare to GUI build