Fix issues noticed by users
Research Tree (unfinished)