Fix #289, #431 issues, and changes on control-draw example