Changed key mapping; Very minor code changes.