Large number of small fixes, including; but not limited to auto-accepting of keys