important updates - fixed issues