Minor changes added for better terminal experience