added Queues, moved filtering & formatting to stream handler
minor typo fixes
removed autosaving pending modification of save method