Draw -> Bar, better initializations, other cleanups.