Multiple drawings + bug fixes