CR changes and fixing command history