Added TE Protection and made a lot of fixes | last commit before 0.3a release