Some minor fixes and graphics injection