fixes and update gui