adapted some files - closes #21