Integrated Matt's changes

Brings this into compliance with FileMaker Standards