improve hints and UI