Tweaks and fixes

Signed-off-by: dchandekstark <dchandekstark@gmail.com>