1.3

cleaning code and update GUI