give credit and other tweaks