more ted fixes, updated bootstrap