Bug fixes and graphics update