More legacy comments and todo added.