Adding complete story and more TODO in NYC links, other tweaks included.