rename security provider, debug and code cleanup