BUGS and TODO added
TODO updated