Starting cli ui, some other small changes
merged