Many important corrections after testing GUI