Updated todos and admin notes