improvements in code and graphics