Fix up hell load of crap
Signed-off-by: shivamk11 <shivamk11@gmail.com>