Add more e keywords and type. Also some TODOs.