fixed updating screen #21 #22