bug fixes on poc 3 19_12_2013

bug fixes on poc 3  from client