remove commented out code, and a todo
add todo's for missing types