New TextUI, new mapping & some fixes