Added TODO
Added BUGS note