added keystone and several improvements that accumulated over time at the installation