Changed alot of stuff, and made sure we can find where the ambiguity lies.