added support for p12
removed debug lines