TODO and other updates