Made some amendments to some design flaws.