add ambiguous peaktypes to lists
massive overhaul of model to hopefully be more robust and better at noticing errors