lots of edits to citations and equations in alpha_bf and groundwater P
fixed conflicts