added hotkey support
minor tweaks
minor tweaks