Trig not case sensitive
Bug fixes