more tweaking, graphics changes, clean up