Improve drawing routines for ABCD