Added key stroke customization. Bug fixes