fixed gui and CLI