various and many tweaks