Slightly better plotting