Hey Frank

I just fixed all the issues you mentioned. Good to merge?

--
Vishesh Handa