fixes all bugs from mischa