Access Key: Tweaks & Bug Fixes

Tweaks & Bug Fixes