Asteroid: performance fix + image bug fix