Fixed. Will push after addressing all the comments.