cleaning + gui update