fixes and graphics