Add te_, comment out random toruqe stuff we dont need, makefile fixes