fixing graphics and other