Added the latest work from bugs list.