Fixed build_fields to pass $source to build_field
Commenting fixes.