New funcions, and updated GUI