FalseClass expression tweaks, data updates