Change draw system to use Draw trait
Fix doctest error
Fix some warnings