Update comments
Minor syntax fixes
Assign build query return val to it's own variable