Changed: TODO and BUGS