cleanup. adjust mask manually. eliminated bugs.