tweaks, add $FROM_SOURCE boolean