Minor changes plus graphics