Update TODO and reorder properties a bit