minor graphics
merge conflicts