add analyzer modes infinity, time span and packet count

+also clean up the include mess a little