Fixed #3 - better update and fixed an update bug