Fixes to automation and especially line drawing...