Updates and some changes

Signed-off-by: Kulamagal Mahendrarajah <kulamagal@qi-interactive.com>