Revert "bug fixes on poc 3 19_12_2013"

This reverts commit f39acf684f84561f18acd2b1026076eb8a643d23.
Bug Fixes on poc 3 19_12_2013

Bug Fixes on poc 3  from client