key support added; some refactorings; removing old version test files