Fixed up visuals to be more general from command line