added TODO and BUGS