Added outline drawing, updated corresponding routines