Removed right prompt, minor changes