iteration 2.2 client and gui updated