added initial ticha fixes