Major fixes

Signed-off-by: Aniket Pant <me@aniketpant>