Updates & bugfixes

Signed-off-by: deepak <dpak.cherian@gmail.com>