added well and other tweaks