Fixed things to work outside of dev and readded TE support