Fixed few minor bugs, most important: keyFileName length too short