Multiple obstacles, minor drawing updates