more cases
merged
first draft of error collector