Improved plotting routines