updated todo, fixed attribute-no-space bug